Revision: bazaar--messages--1.4--patch-10
Archive: Matthieu.Moy@imag.fr--public
Creator: Matthieu Moy <Matthieu.Moy@imag.fr>
Date: Mon May 23 08:42:37 MEST 2005
Standard-date: 2005-05-23 06:42:37 GMT
Removed-files: commands/lock-pristine.c
    commands/lock-pristine.h
Modified-files: commands/abrowse.c commands/add-pristine.c
    commands/ancestry-graph.c commands/annotate.c
    commands/cachedrevs.c commands/cacherev.c
    commands/cmds.c commands/find-pristine.c
    commands/get-changeset.c commands/get.c
    commands/join-branch.c commands/lock-revision.c
    commands/pristines.c commands/update.c
    libarch/ancestry.c libarch/archive-mirror.c
    libarch/archive-pfs.c libarch/archive.c
    libarch/archive.h libarch/build-revision.c
    libarch/commit.c libarch/import.c libarch/invent.c
    libarch/libraries.c libarch/libraries.h
    libarch/library-txn.c libarch/library-txn.h
    libarch/local-cache.c libarch/local-cache.h
    libarch/pristines.c libarch/pristines.h libarch/replay.c
    libarch/tag.c libawk/relational.c libawk/relational.h
    {arch}/=tagging-method
New-patches: Matthieu.Moy@imag.fr--public/bazaar--inventory-non-ascii--1.4--base-0
    Matthieu.Moy@imag.fr--public/bazaar--inventory-non-ascii--1.4--patch-1
    Matthieu.Moy@imag.fr--public/bazaar--messages--1.4--patch-10
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-90
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-91
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-92
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-93
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-94
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-95
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-96
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-97
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-21
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-22
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-23
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-24
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-25
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-26
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-27
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-28
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-29
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-30
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-31
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-32
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-33
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-34
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-35
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-36
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-37
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-38
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-39
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-40
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-41
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-42
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-43
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-44
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-45
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-46
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-47
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-48
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-49
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-50
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-51
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-52
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-53
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-54
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-55
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-56
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-57
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-58
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-59
    thelove@canonical.com/bazaar--devo--1.4--patch-58
    thelove@canonical.com/bazaar--devo--1.4--patch-59
    thelove@canonical.com/bazaar--devo--1.4--patch-60
    thelove@canonical.com/bazaar--devo--1.4--patch-61
    thelove@canonical.com/bazaar--devo--1.4--patch-62
Summary: Merged from upstream
Keywords: merge

Patches applied:

 * Matthieu.Moy@imag.fr--public/bazaar--inventory-non-ascii--1.4--base-0
   tag of thelove@canonical.com/bazaar--devo--1.4--patch-58

 * Matthieu.Moy@imag.fr--public/bazaar--inventory-non-ascii--1.4--patch-1
   Allow non-ascii characters in inventory (use unsigned chars for char comparison)

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-90
   merge from -mac

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-91
   merge from thelove

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-92
   code tidy up from stricter CFLAGS than used in -mac development.

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-93
   dead code removal - nothing creates locked pristines: remove all code related to locked vs unlocked pristines. Also remove the sibling tree cache search (which has created continual issues when folk change history)

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-94
   use new ar abstractions to expose the creator/copiers of rel_tables, helping diagnose memory leaks

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-95
   fix memory leak in rel_copy_table

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-96
   more rel_table memory allocation feedback foo

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-97
   fix the fix for rel_copy_table - ownership is on the result not the source

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-21
   read only vim locks should be ignored

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-22
   scan_archive takes and emits a patch_id

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-23
   teach direct_descendants api about patch ids

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-24
   end_revision for scan_ancestry -> patch_id

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-25
   continuation output from find_multisource - > patch_id

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-26
   cached rev output for find_multisource and find_prev_revision -> patch_id

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-27
   revision argument to find_multisource -> patch_id

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-28
   find_prev_revisions last non-patch-id-patch-id parameter converted

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-29
   convert make_patch_lists ancestor parameters to patch_id

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-30
   dead code cleanup

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-31
   arch_greedy_library_wants_revision to patch_id api

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-32
   arch_library_*_add_choice to patch_id apis

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-33
   find_patchlists and copy_archive_revision to patch_id apis

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-34
   copy_local* functions to patch_id apis

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-35
   arch_library_index to patch_id

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-36
   find-pristine and callers to patch_id api, remove old larch internal lock-pristine UI command

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-37
   find_library_forwards to patch_id api

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-38
   copy_cached revision to patch_id api

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-39
   find_previous_library to patch_id api

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-40
   make_patch_list and find_previous_precious to patch_id apis

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-41
   patch_direction to arch_patch_id

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-42
   apply_revision_patch to patch_id api

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-43
   decrement_revision partial patch_id conversion

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-44
   find_for_revision partial patch_idification

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-45
   decrement_revision to patch_id api

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-46
   find_previous_revision returns an arch_patch_id

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-47
   in find_previous_pristine do not abuse arch_previous_revision

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-48
   find_previous_library returns a patch_id

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-49
   copy_import_revision takes a patch_id

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-50
   snapshot of find_for_previous rework

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-51
   find_for_previous_revision now returns the found revision. Overhaul usage of archives in build-revision - always take a reference during assignment, so dereferencing is unconditional.

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-52
   fix mem leak in decrement_revision

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-53
   decrement_revision returns the decremented revision

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-54
   scan_archive - remove unused parameter (by callers) and convert newest_cached output parameter to patch_id

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-55
   build_revision to patch_id api

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-56
   change all used archive apis from build-revision to accept patch_ids

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-57
   change all used archive apis from build-revision to return patch_ids

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-58
   oops, broke mirror

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-59
   check that reference trees have a valid and correct default version and revision, and recreate them if they do not

 * thelove@canonical.com/bazaar--devo--1.4--patch-58
   progress dots on the same line as the previous message for "merge"

 * thelove@canonical.com/bazaar--devo--1.4--patch-59
   Allow non-ascii characters in inventory (use unsigned chars for char comparison)

 * thelove@canonical.com/bazaar--devo--1.4--patch-60
   build-revision to patch_id api throughout, as well as used apis. for added tastiness bugfix local tree retrieval to reject and replace reference trees with missing or incorrect identification... and remove larch-inherited lock-pristine ui command

 * thelove@canonical.com/bazaar--devo--1.4--patch-61
   use new ar abstractions to expose the creator/copiers of rel_tables, helping diagnose memory leaks

 * thelove@canonical.com/bazaar--devo--1.4--patch-62
   fix memory leak in rel_copy_table - highly recommended patch - fixes failure to fork errors and drops memory footprint by O(patches applied) for build_revision


